Skip to content

Fix IntegerArray pow for special cases #30210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

TomAugspurger
Copy link
Contributor

Split from #29964

Only 9e5a69c is relevant. The rest is #30183, but pushing this up now.

@gfyoung gfyoung added Bug Dtype Conversions Unexpected or buggy dtype conversions labels Dec 12, 2019
@gfyoung
Copy link
Member

gfyoung commented Dec 12, 2019

With #30183 merged, I think this needs a rebase to facilitate review and to check if the changes are still good from 9e5a69c.

@jorisvandenbossche jorisvandenbossche added this to the 1.0 milestone Dec 12, 2019
@TomAugspurger
Copy link
Contributor Author

My merge in b5a4112 also includes #30183

@TomAugspurger
Copy link
Contributor Author

FYI @jorisvandenbossche this is slightly blocking #29964. It'll make the changes there more focused.

mask = np.where(other == 1, False, mask)
# 1 ** x is 1.
if omask is not None:
mask = np.where((other == 1) & ~omask, False, mask)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this check for self._data == 1 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, no, because it is for the reversed op? (maybe add a comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your call on whether a comment is needed. It's clear IMO, though I wrote it :)

@TomAugspurger
Copy link
Contributor Author

@jorisvandenbossche good to go here?

@jorisvandenbossche jorisvandenbossche merged commit 9294f91 into pandas-dev:master Dec 14, 2019
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Dtype Conversions Unexpected or buggy dtype conversions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants